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

Merge changes from topic "presubmit-am-e79376c595e84012896e46b94a9fa3c3" into tm-mainline-prod am: dfab9a7b

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



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