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

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

Change-Id: I20be1778be2f00d8cbd310743f0a93b350fd8313