[automerger skipped] Merge "[DO NOT MERGE] Explicitly keep relevant LogBuffer classes for plugins" into udc-dev am: 3317c480 am: 41202220 -s ours

am skip reason: subject contains skip directive

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



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