Merge changes from topic "am-b0c2c9886d5349caa5ba9c438729bc00" into tm-d1-dev-plus-aosp am: b377b183 am: 28b9dfb9

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



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