Merge "Add owners for controls" am: 71678b8c26 am: bae11b97c7

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

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