Merge "Make SecureElement service bootaware"
am: 8252356fc4

Change-Id: I5e1eada518f5c85939535b0038c96956913ba34e