Merge changes Ibe4ba52b,I0a83ce98 into udc-dev am: dd3b36eb am: d4b45f87 am: 479f736d am: c72aad40

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



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