[automerger skipped] Merge "Move the app to /system_ext" am: ca891c7a22 am: 9db6d5922b am: 2e47d86840 -s ours
am skip reason: Change-Id Ida940a2e1bb832cf5c3d147297e7ed65fa6921d5 with SHA-1 6af66b01c7 is in history

Change-Id: I24a2eb5fc85482edad8f49d06f963ea6cdd43102