Merge changes from topic "presubmit-am-0d3423230d7643768df4ed2481c598da" into...

Merge changes from topic "presubmit-am-0d3423230d7643768df4ed2481c598da" into tm-mainline-prod am: e4c67002

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



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