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