Merge "Update test to run with instant app mode."
am: f37fa407df

Change-Id: I5f9055d7df75f441bebde88c29c63ba4a79ba7c4