Merge changes Iaef3c67b,I983277fd into tm-qpr-dev am: 9dca500295

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

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