Merge changes from topic "presubmit-am-c20c0da00976457cab49cb52a2dd965e" into tm-mainline-prod am: 990bb220

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



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