[automerger skipped] Fix Slogf to behave like Slog am: b05a879c -s ours

am skip reason: Merged-In If8d2ffe5bda51add08e2c952871e0c646ebb2474 with SHA-1 84fbdc97 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21535649



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