Merge changes from topic "presubmit-am-0ceaf5de4b364feeaa00d2d1e8e8414b" into tm-dev am: 033ac7f4

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



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