Merge changes from topic "art-owners-update" am: 6066f5dae1 am: 74ad7baf85 am: 11f0a179d7 am: 03c7f1ce80 am: 7c7fe31e82

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

Change-Id: I876d9444a009a5a769995e8792fd802555e4be86