Merge "Merge "Move the app to /system_ext" am: ca891c7a22" into stage-aosp-master