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

Change-Id: If361783d0077d823fdf75fee247de2f0271d1065