Merge "Address comment from aosp/1232197" am: 794e6ba2 am: a87d0302 am:...

Merge "Address comment from aosp/1232197" am: 794e6ba2 am: a87d0302 am: d471a804 am: 8d257512 am: 9391dad8

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

Change-Id: Ib1c65c3f9880792b49813bb6871f0eb8f0dcb880