Merge "Move the app to /system_ext" am: ca891c7a22

Change-Id: I1742d39655c879123a0c8206a1c3a0b2ffef62fd