Merge changes from topic "am-d2f9204700b74fe8b08cf61658fc359c" into...

Merge changes from topic "am-d2f9204700b74fe8b08cf61658fc359c" into tm-d1-dev-plus-aosp am: 541fbb0a

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



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