Merge changes Ie8c5a77b,I96125e9f into tm-qpr-dev am: 4fdf7f46f1

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

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