Merge changes from topic "presubmit-am-ba9a65b8c2614633a723da06cb672519" into tm-mainline-prod am: d155cda1

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



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