Merge changes from topic "presubmit-am-190a79a848d94da2a852a0431482f57d" into...

Merge changes from topic "presubmit-am-190a79a848d94da2a852a0431482f57d" into tm-mainline-prod am: cfdb38a5

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



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