Merge changes from topic...

Merge changes from topic "revert-2110246-revert-2108043-locallog-RHVOQAJCFV-GELQNRAIEE" am: ab498bff am: 755b013a am: ad25b2a2 am: 61ca2b11

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



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