Merge changes from topics "fix3", "fix4" into udc-dev am: 245b979b am: dbd6b8b7

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



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