frc_340818110 (10572802,com.google.android.adbd,com.google.android.appsearch,com.google.android.captiveportallogin,com.google.android.cellbroadcast,com.google.android.configinfrastructure,com.google.android.conscrypt,com.google.android.documentsui,com.google.android.extservices,com.google.android.healthfitness,com.google.android.media,com.google.android.media.swcodec,com.google.android.mediaprovider,com.google.android.neuralnetworks,com.google.android.permission,com.google.android.resolv,com.google.android.rkpd,com.google.android.scheduling,com.google.android.sdkext,com.google.android.uwb,com.google.android.wifi)
[automerger skipped] Merge Android 12 am: e50d84f657 -s ours am: abee3c07bf -s ours am: 493b1834ae -s ours am: c7d339e1b1 -s ours am: 2c3eace0d5 -s ours

am skip reason: Merged-In I73d64334d80989a28d24d4528122c754d6b653e9 with SHA-1 a048cbce4b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/UniversalMediaPlayer/+/1847671

Change-Id: I5ed4321368d2173496fce4ad68e463343b0f3769