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

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

Change-Id: I7b009607fd540a17b3b428804ca683e224295d3d