Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev am: 8fb55d41

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

Change-Id: I0b17a08a18ca964e26cc7eef0f4776aa209825e2