Merge changes from topic "am-7a5f52f47235411fa8dfee28cc6f9acb" into...

Merge changes from topic "am-7a5f52f47235411fa8dfee28cc6f9acb" into tm-d1-dev-plus-aosp am: f6419dd3 -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: I0761112d7d218ae4a5230b2806ec8702f640da3a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>