Merge changes from topic "am-156d9b0a90bd493aa35e53997675854e" into...

Merge changes from topic "am-156d9b0a90bd493aa35e53997675854e" into tm-d1-dev-plus-aosp am: 33e3b212 am: acc3b128

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



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