[automerger skipped] Merge "Fix coding styles for erase euicc only options" am: d3db03b520
am: 2f30e9107a
am: 5ef6e587c1
-s ours am: f7586147f8
-s ours
am skip reason: skip tag Change-Id I08bb8d9f73dbe6b9f18f36c45ae7652b36d422b2 with SHA-1 2404806afb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1653068
Change-Id: I585e442961fc142fa80c797987d20c9b4634aff3
This commit is contained in: