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

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

Change-Id: Ida4e4b34b59d501e906b4c86dec9e2a8d494639c