Fix a couple minor but visible issues am: 0764d9e8f3 am: 47944ace97 am: 7c32216540

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

Change-Id: I9597e9d330acc4ba514b996f4a2ab5cbb32532ea