Merge changes If7fb2450,I36614c86,Ic8bd2d0e,I4062f1f4 into tm-qpr-dev am: 55395739d4

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

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