Merge "CTS: Add set-agent-app tests" am: c39139885d am: 381c95a341
am: 1714c8a111

Change-Id: I701ef7c9338f4e176475b12df7f1e83c6d55f6b6