Merge "Move the app to /system_ext" am: c8e4d7953e am: 495d861928

Change-Id: If9903907b9b81a9d98920ffd3f11b11e6af0d5db