Merge changes from topic "presubmit-am-b057281039d04692b0ea003eb96da7d1" into tm-mainline-prod am: 3878b00e

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



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