Merge "[FUI26] Address comments on aosp/1560408" am: 819b9a637e am: ee455cedce

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

Change-Id: If6b9da9ce754f33868305075013b0f82ff64fedb