Merge "Simplify platformprotos" into udc-dev am: 71ea5dd2 am: 27e51bb2 am:...

Merge "Simplify platformprotos" into udc-dev am: 71ea5dd2 am: 27e51bb2 am: 7d5c61c0 am: c7817322

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



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