Merge "Move the app to /system_ext"
am: eaee8a5229

Change-Id: Iec05cb1bcbe6eebb1592262eac87fd5b279d948f