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

Change-Id: If82ec56401d73d7a18c47e14ca80d2cce54f07ec