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