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

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

Change-Id: Ieca8e912713aa966422f49530dfe7bbde4e480ff