Merge changes I28706e2e,I0af8480c into tm-qpr-dev am: 74787ef182

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

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