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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1ede7d126fe6a610c9c4c4dc8c631270a599d3cb