[automerger skipped] Merge ab/7633965 am: 62b1150e9c -s ours

am skip reason: Merged-In I38cc89bc7f81f8d6d6165a4b8f344c0660c10364 with SHA-1 ee3097ce79 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/extras/+/15547311

Change-Id: I23361ee634177596b0dcca8ea551fa4be8783647