Merge changes I60fb07e4,Ie16987a8 into tm-qpr-dev am: 231b56c7

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



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