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

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



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