Code sync to aosp branch am: a05bb069e2 am: 406aec1da7 am: 028ac8c3ca am: f2aa93b087

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

Change-Id: I064f2f9a51ee2b5dd1a3953dc4b35d8ab4953fcb