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

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



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