Merge changes from topic "am-570f291171f2406e87a9196e328158df" into...

Merge changes from topic "am-570f291171f2406e87a9196e328158df" into tm-d1-dev-plus-aosp am: 56983bcc

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



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