Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into...

Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: 8ab4451e

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



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