Merge "Merge changes Ie6015f71,Ib14d60c0 into udc-dev am: 2cdde680 am:...

Merge "Merge changes Ie6015f71,Ib14d60c0 into udc-dev am: 2cdde680 am: ac1451a1" into udc-d1-dev-plus-aosp am: bb96d562

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



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