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

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



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