Merge changes from topic "am-00f4abd068ea4927816c01a5fddfa532" into...

Merge changes from topic "am-00f4abd068ea4927816c01a5fddfa532" into tm-d1-dev-plus-aosp am: 2fdfdba7 -s ours

am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 78245566 is already in history

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



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