Merge "Fix non-varargs call of varargs method warning" am: 6b3ecd3217 am: 3e84b0f075

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2045563

Change-Id: I2a5f2bc93b83e949f6e934fed706a39d157b2acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>