Snap for 7146909 from b3f92fe65cc033dc02107cc127e0ae0e2a50a967 to sc-release am: 4d0c018546

Original change: https://googleplex-android-review.googlesource.com/c/platform/sdk/+/13576328

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbebd805edf38018985f142e6e5cebf43a23e77f