Merge \"Make \"cmd package set-home-activity\" more CTS friendly\" into nyc-mr1-dev
am: 2a6f79d45f

Change-Id: I09289508e106f0afe34ab266453b296e97910a26