Merge changes I9907038a,Ic5de4d43,I0435e07a into tm-qpr-dev am: 6213522d86

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

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