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

Merge changes from topic "presubmit-am-ed2b3375a9a3486aaa234f77fc055b40" into tm-mainline-prod am: 79e287f8

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



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