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

Change-Id: If75c7690add3b52fbaf94f8329cb190ea9829dd4