Merge changes Icb51a009,I1dff6dc1,I5effca8f into udc-dev am: a11b92b7 am: d36e28c5 am: 033419f8 am: 75c3379d

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



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