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