Merge "[Cherry-pick] Simplify platformprotos" am: 6f0164a2 am: 14633642

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



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