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

Merge changes from topic "presubmit-am-ed5f54067b43489f9b9b4b3c8bcae94d" into tm-mainline-prod am: f2359847

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



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