Merge changes Ifd7bc217,I337d0189 into tm-qpr-dev am: 27df631c6f

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

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