Merge changes from topic "am-06ea116367e346e2be5e0ca286038d46" into...

Merge changes from topic "am-06ea116367e346e2be5e0ca286038d46" into tm-d1-dev-plus-aosp am: 52ee17be -s ours

am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 cf62c760 is already in history

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



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