Merge "Add UID and Service for Secure Element Application" am: b8b7589531 am: 8ee3204c58
am: 2b894394a5  -s ours

Change-Id: Ic0681499e0690883dedecaa2e80269f1412d8e94