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

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

Change-Id: Ia08a2d1f91651db42b5f04065ce02e139774f572