Merge "Make the new proto build" am: 606a64f7da am: 3077dfa613 am: 86f922435f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff934cbf94a2abd4cc941a60c316538cdf787e15