Merge "Move the app to /system_ext" am: eaee8a5229 am: 86783efdf4 am: 956724b58a

Change-Id: I26c0a9ef03959256fe732a5b3a13fbd3182d7344