Merge "Simplify platformprotos" into udc-dev am: 71ea5dd216

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

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