Merge changes I14d4907c,I36555324 into tm-qpr-dev am: 90f6264a66

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

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