[automerger skipped] Merge "[Cherry-pick] Simplify platformprotos" am:...

[automerger skipped] Merge "[Cherry-pick] Simplify platformprotos" am: 6f0164a2 am: 14633642 am: c595ddab -s ours am: 90017b38 -s ours am: ebaf2a34 -s ours

am skip reason: Merged-In I442822184ae02429337ff903db630028902d4d4f with SHA-1 8095ea6e is already in history

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



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