Merge "Move the app to /system_ext"
am: 24df85c79c

Change-Id: I8f031d06a063991f2e9d98fe5aadbf8692772a70