Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into sc-mainline-prod am: be8370734f am: b633ed2b9c

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

Change-Id: Icb22a7c5ff3a81ad83009cce0254e763eec882b4