Merge changes I1c9ade7e,I06365d19,I0945a29d,I8e798197,Ib3a4f14b, ... into tm-qpr-dev am: 74daba5ad9 am: b9ace6dcb2

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

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