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] Mark ab/7061308 as merged in stage. am: 0f95f9aef3 -s ours am: a1ed85f9d6 -s ours am: c3b86649cf -s ours

am skip reason: Change-Id Id955c23cd4ef7f20518193a7cc3030be5045fc84 with SHA-1 46de5aba9e is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a52c38c4ebc7b187fc0b38c55b7e44390eaed57
tree: 857c06d175eb126d3bf461cad47007d867281814
  1. src/
  2. Android.bp
  3. AndroidManifest.xml