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

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

Change-Id: I8c62d218953027ee2fb5426ddacae5a6f8bb6c73