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

Merge changes from topic "presubmit-am-ac749fe11aae4075aa5ce08e74c9169c" into tm-mainline-prod am: 8e1636de

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



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