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

Change-Id: I74bedb53e41a950202d6f27980717e35930765e2