Merge "Address comments on aosp/1448415" am: 1a41c294c5 am: bafa575166 am: 2920fb27af am: 94040f7db0

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

Change-Id: If14a6913d9d721f0fa680afe0ee51e089fddb749