Merge changes from topic "presubmit-am-9fdbad9da9a94b66a07e5160c90c8535" into...

Merge changes from topic "presubmit-am-9fdbad9da9a94b66a07e5160c90c8535" into tm-mainline-prod am: bf482b76

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



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