Merge "Add eSE AID." am: e323976e74
am: 4614ba5134

Change-Id: I0c01a20e15bda8979cda473ffe255aabf61c8483