Merge changes I04fa90bf,Id413d57d into tm-qpr-dev am: 7f90cf447d am: 99d63e702b

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

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