Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7

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

Change-Id: Ib54802430fc785ac4cf6094c42c26bb654b361df