Merge changes from topic "presubmit-am-402aa9e0c5db4b77854cdb590a812293" into tm-mainline-prod am: ae5454cc

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



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