Merge "Fix CTS tests related to ephemeral apps on Watch" into oc-dev
am: 09d605d4db

Change-Id: Ibca2aeafa6fa878a16fb42398274c0b6cde8530e