Merge changes from topic "presubmit-am-78ae5717d40d44d6a2cbc960219892d4" into tm-mainline-prod am: c2a4128e

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



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