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

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

Change-Id: I3613a1ce40f39937894b6cab458005b67ed8bb78