Merge changes Ic62b7358,Ic3f7e62a into tm-qpr-dev am: 0c76ea59be am: 23c9b021be

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

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