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

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

Change-Id: Id5cf529e4f525ee3f4e7779ae155c54741a389c3