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

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

Change-Id: Iabdcc3b95239019a625e9823f70c30a9bded706a