Code sync to aosp branch

Sync internal branch code refactor to aosp.

Bug: 152008670
Test: adb shell dumpsys secure_element
Change-Id: Ib7e2d0d6ca12669d11e7c2319dd1f8e04c958400
1 file changed