Merge changes from topic "presubmit-am-7666fbe24a514c8596b25962eeaf27e8" into tm-mainline-prod am: 41f60aec

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



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