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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90569feaa927d702f19c8a23e993196e20a98976