Merge "Merge changes I4b9e6f1e,I9cfa39f1 into udc-dev am: b66ce3a1 am: 91389482" into udc-d1-dev-plus-aosp am: 3d39b70b

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



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