Merge "Address comment from aosp/1232197" am: 794e6ba285 am: a87d030207 am: d471a80425 am: 8d25751223 am: 9391dad808

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

Change-Id: Ib1c65c3f9880792b49813bb6871f0eb8f0dcb880