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

Merge changes from topic "presubmit-am-ebcfe956c23946389d9e3472b2f2b668" into tm-mainline-prod am: 36c4211d

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



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