Merge "Add owner to codegen annotations" am: 7765329813 am: e897f5f8d6 am: ea70d5adc2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9154535efa649300ee1b7a27e7739f24cf037b5b