Merge changes from topic "presubmit-am-892bfeed2a87403cb4f8a1675e774b12" into sc-mainline-prod am: 3f4e094f

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

Change-Id: If4ef953d89808f32196f0fca6ac795baa6955bce