Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE" am: ab498bff17 am: 755b013a70 am: ad25b2a205

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

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