Merge changes Ib389aa7f,Ib8e7bc41,I04eadac7,I55e6be8a,I69a3d21b, ... into udc-qpr-dev am: 613ab7f37d am: 269beb10a0

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

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