[automerger skipped] Merge "Move the app to /system_ext" am: c8e4d7953e am: 495d861928 am: 6efee9f387 -s ours
am skip reason: Change-Id Icd2f7fc7021e84fad9980d58688dc640ca4245f8 with SHA-1 68da89b6d8 is in history

Change-Id: I07e1612bd2f92960e4b8871f9cb04ad62d51c988