Merge changes from topic "presubmit-am-d05e9dc23fa04dc3b45b8fa33d154783-sc-dev" into tm-dev am: 8fb55d4172
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17159706 Change-Id: I7d518f9c919098352ec770b234b02888d362e0e6
This commit is contained in: