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

Merge changes from topic "presubmit-am-d3edc2b63dca42ef83af1bcef3b4550a" into tm-mainline-prod am: 456d0a7e

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



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