Merge changes from topic...

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

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



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