Merge changes I1d593900,I179c69c1 into tm-qpr-dev am: 2d7fb7b2

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



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