Merge changes from topic "am-4a6e50c98b7c493ca8be34f1a3abf1b2" into...

Merge changes from topic "am-4a6e50c98b7c493ca8be34f1a3abf1b2" into tm-d1-dev-plus-aosp am: d3a8c447 -s ours

am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 2f2e7d84 is already in history

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



Change-Id: I2866178380d0cb307a76122d6057352acb8afd89
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>