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

Change-Id: I8b62651e320ce1dd6a4adf75564e0deb92b0cea2