[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 01d6f2938f -s ours am: 7027df47b2 -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/+/15550142

Change-Id: Ia3a4f089056965f908bbbf21913e42be468a6289