Merge changes from topic "presubmit-am-76a0661477634fa59e88f792ef7d874b" into...

Merge changes from topic "presubmit-am-76a0661477634fa59e88f792ef7d874b" into tm-mainline-prod am: 3b65b5f3

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



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