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

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

Change-Id: I86a2f48ee199c83c429d99d5025ece56f42251cd