Merge "Address comments on aosp/1612040." am: e486d38855

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2