Merge "Add android.hardware.secure_element@1.1" am: 078f8c0a14
am: 123ec7cc08

Change-Id: I3978616c78ec73c8d2fa3fc8efd75b4426b7814e