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

Change-Id: Ifff63066fd68c4641b77e546a776cead0c18ec04