Snap for 7160059 from f5164c45077334793614e9e6d7ef25a8c9abc77e to sc-release am: e8732f4f1f

Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/13644914

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf65f9616e949be95da740391cff0b984f5653dc