Don't stop Android Framework before the test runs am: c30a82374a
am: 7aedcba731

Change-Id: I00ec923234c52dadd5631ab6f887362c1427e994