Merge "Merge "Revert^2 "Move LogBuffer and related to SystemUILogLib."" into...

Merge "Merge "Revert^2 "Move LogBuffer and related to SystemUILogLib."" into udc-dev am: 46805d76 am: 18ec333e am: 52e1f667" into udc-qpr-dev-plus-aosp am: 8412c727

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



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