Merge "Add android.hardware.secure_element@1.2" am: 5b7f7d0b67 am: 6ee646adc4

Change-Id: I7ee92b7e3c74defdb0aedf4181a5b65571ba6e30