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

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



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