Merge changes I027cc96c,I44bb8191 into tm-qpr-dev am: ccafe39e56 am: 2b45255860

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

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