Merge "Move the app to /system_ext"
am: ca891c7a22

Change-Id: Iff6d217bfc02ddad2a622e9f5481d36eedf87b9b