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

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

Change-Id: I8835c22e35b1f0bb34067cd52fa0c3e62a245f65