Merge "Restore security context after sns_reg_init process interrupted" into rvc-qpr-dev am: 0a14975818 am: cf6b6077e1 Original change: https://googleplex-android-review.googlesource.com/c/device/google/sunfish/+/12722724 Change-Id: I53163609f33979430f30a20aecabd90a17618a80