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

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

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