[automerger skipped] Merge "Move the app to /system_ext" am: c8e4d7953e am: 3aa8d52dd6 -s ours am: 41c2ff7b7a -s ours
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 68da89b6d8 is in history

Change-Id: Iaf3f0148702058eb1451e6295f145fd2a6246ff2