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

Change-Id: I9e68ba44beef15c77ab1c43903af8dd965fb681e