Merge "Include component ID in OWNERS file" am: b333f43dec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I582209f3b6ec1fc97057215d4afe71f5ba84bf87