[automerger skipped] Merge "Fix Slogf to behave like Slog" into udc-dev am: 44f8b700 -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: I286780ddd59e5d4cf051c080d931b3c52e55300b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>