Merge commit '048a6a8a84e8718dbb884121b71aa650e20ef823' of sso://googleplex-android/platform/hardware/st/secure_element2 into HEAD
Change-Id: I56878daf259cba3bafcf857905bad86a5f409a6a