[automerger skipped] Merge "Add owners for controls" into tm-qpr-dev am:...

[automerger skipped] Merge "Add owners for controls" into tm-qpr-dev am: d065bb8c -s ours am: 297bf9e6 -s ours

am skip reason: Merged-In Ief1fc9185574e25e47e496fdeec26880f35dcb09 with SHA-1 1b0810e4 is already in history

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



Change-Id: I2973c9276a4c4691ad5693f581289ec05660377a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>