Merge changes Ib10fa8e9,Iaad14420 into tm-qpr-dev am: 7169bb42d7

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

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