Merge changes from topic "presubmit-am-bd01718025d3469587dc5fe9b7b57165" into...

Merge changes from topic "presubmit-am-bd01718025d3469587dc5fe9b7b57165" into tm-mainline-prod am: d6bcf4e0

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



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