Merge changes I8d766f4a,I3f5e212f,Ia78513a0 into tm-qpr-dev am: 7ae85de520 am: 429d952778

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

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