Merge "Make the new proto build" am: 606a64f7da

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id591371447cccbe6ad90ff2ff066068f9ead3167