[automerger skipped] Merge "Move the app to /system_ext" am: 24df85c79c am: cb0eff8f88 -s ours am: 7949ddd4e3 -s ours
am skip reason: Change-Id Ia727541b31d206d8106bfe66f6afb70d639224de with SHA-1 961d5a14e0 is in history

Change-Id: Id5874e2ad7ba0302781099e8c34a6cfe6eb462b8