Merge "installd_service_test: fix ServiceTest.CreateAppDataSnapshot_ClearsCache"
am: 4febfd6da7

Change-Id: I1134649531c898a20d524d26a8d40e63aeec9132