Merge "Address comments on aosp/1612040." am: 0f6df3ba7d am: d0a19e01c1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I292f206377968a10052e0759d26819583e164b5a