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

Merge changes from topic "am-fc9e22530ab045349ddb80b66a5c82b3" into tm-d1-dev-plus-aosp am: 0b234a34 am: ea901c3a

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



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