Merge changes from topic "presubmit-am-217de16dd7fe44a0a5e782a9ac109aa5" into...

Merge changes from topic "presubmit-am-217de16dd7fe44a0a5e782a9ac109aa5" into tm-mainline-prod am: a572429e

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



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