Merge "Add AID for Secure Element Application" am: d3e7e31d28
am: 66c3eb0e45

Change-Id: I650d8ca9171aba487f883bde5cbea3e7a3e0c145