[automerger skipped] Merge "Create platformtestprotos." am: c06ebb02 am:...

[automerger skipped] Merge "Create platformtestprotos." am: c06ebb02 am: 4ccdeba9 -s ours am: 2523b1fb -s ours

am skip reason: Merged-In I82386a6c8a5e6ddf42d8377148001f4ede2f297f with SHA-1 d61699e8 is already in history

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

Change-Id: Ib5545b3e1adfba148b37a9f5f3fbf325704c5d54