tree beb4b62ec29b624fba44bd383dd84b772ef5ae19
parent e7774e72325fc70e93b2d4c34a0f45703227eb9d
parent 61487dface431a1d6d1f8311031ccacf91e3f879
author Jiashen Wang <jiashenwang@google.com> 1613614881 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613614881 +0000

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bcaf am: 24162e1679 am: 61487dface -s ours

am skip reason: Change-Id Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 with SHA-1 a24192a749 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562338

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26ecfc84f987c2a913180125c36022836d1b8e26