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

Change-Id: I393f3bf319a9fc600949bd4361460edb8030b70c