[automerger skipped] Merge "Make the new proto build" am: 606a64f7 am:...

[automerger skipped] Merge "Make the new proto build" am: 606a64f7 am: 3077dfa6 am: 86f92243 am: aa7c7cc3 -s ours

am skip reason: Change-Id I6e71cdd3c129f0437a354c1aa8821df36b8dea74 with SHA-1 ba84008f is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I398eec9e765bb3ff59651dfc46764c1b9cf5aa0d