Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into...

Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp am: 1d24db6e

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



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