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

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

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