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

Merge changes from topic "presubmit-am-e1e5072c189643ed83e1f1803cce8a69" into tm-mainline-prod am: f58bd53c

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



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