Merge changes I040f8c30,Ifea61ce5,Idb0fc71f,Ia121ea81,I10921ebf, ... into udc-qpr-dev am: 156b1f9114 am: 4937db6916

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

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