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

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

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