Merge "Fix minor issues." into udc-dev am: 756143de

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



Change-Id: Ida3995532c3404270d44e8f86704d4c8daab02a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>