frc_340819010 (10586669,com.google.android.adbd,com.google.android.adservices,com.google.android.appsearch,com.google.android.captiveportallogin,com.google.android.configinfrastructure,com.google.android.conscrypt,com.google.android.documentsui,com.google.android.ext.services,com.google.android.extservices,com.google.android.go.adbd,com.google.android.go.adservices,com.google.android.go.appsearch,com.google.android.go.captiveportallogin,com.google.android.go.configinfrastructure,com.google.android.go.conscrypt,com.google.android.go.documentsui,com.google.android.go.extservices,com.google.android.go.ipsec,com.google.android.go.mediaprovider,com.google.android.go.networkstack,com.google.android.go.neuralnetworks,com.google.android.go.ondevicepersonalization,com.google.android.go.os.statsd,com.google.android.go.resolv,com.google.android.go.rkpd,com.google.android.go.scheduling,com.google.android.go.sdkext,com.google.android.go.tethering,com.google.android.go.tzdata5,com.google.android.go.uwb,com.google.android.go.wifi,com.google.android.ipsec,com.google.android.networkstack,com.google.android.neuralnetworks,com.google.android.ondevicepersonalization,com.google.android.os.statsd,com.google.android.resolv,com.google.android.rkpd,com.google.android.scheduling,com.google.android.sdkext,com.google.android.tethering,com.google.android.tzdata5,com.google.android.uwb,com.google.android.wifi)
[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 545f2961b6 -s ours am: 7e248745a2 -s ours am: f9244ffc20 -s ours
am skip reason: Merged-In Ie1510b730a4c573b8e3d970bb3f04d6c4d94e90e with SHA-1 9553356090 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/16276065
Change-Id: I5288bb3c5d77e666a8a0a5d3d3e34eb4ef314c8f