Merge "[FUI26] Address comments on aosp/1560408" am: c1e493f98d

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

Change-Id: Idde0e161d6241a5c45c0b751e1fca912ed10c7a8