Merge changes from topic "presubmit-am-ec42187f28a94a2b87404bbf069323c2" into sc-mainline-prod am: b7e551bd

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

Change-Id: Ida5ef76ff0235d27f9d4879d40121f11c8043855