Merge "Move the app to /system_ext" am: eaee8a5229 am: 86783efdf4

Change-Id: I6665db7c2e03a589cff777f0167bc635ac3c55f8