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

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

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