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 "Merge Android 12" am: f601f40512 -s ours am: 430a585802 -s ours am: b0ab7df290 -s ours am: e87053a4f8 -s ours am: 5783987ad0 -s ours

am skip reason: Merged-In Icf7492e392cf20986990be2752e6357d4cdb352c with SHA-1 2fe8554eae is already in history

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1847313

Change-Id: Ib377d093adc53b68b77975882c96b674b07e8679