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

Change-Id: I45e686cd1f4fb7d015cfde13d6b193c1bce7ef83