Merge "[automerger skipped] Refresh terminal instances when switching between SS and DS am: a0108ddb86 am: 66db1eb283 am: 57ba8db9d4 -s ours" into rvc-qpr-dev-plus-aosp am: 53149f785b -s ours

am skip reason: Change-Id I8bb13b43de6f17f0b5b82440708d90bf684ca7ec with SHA-1 a0108ddb86 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/11675379

Change-Id: Ie99221738cdddbebaaae22f68372e4ab3c0dd304