Merge changes from topic "art-owners-update" am: 6066f5dae1

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

Change-Id: I0107c8e3e035e08fa0241dd4e6e69d409f7a1d74