[automerger skipped] Merge "Merge "Move the app to /system_ext" am: ca891c7a22" into stage-aosp-master am: a95d53aeb7 -s ours am: abe4bf7ecd -s ours
am skip reason: Change-Id Ida940a2e1bb832cf5c3d147297e7ed65fa6921d5 with SHA-1 6af66b01c7 is in history

Change-Id: I88fb1e88a20dd24c9296be6afe2d9545960e175d