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

Change-Id: I52182a9a79f3306c57bec5ae1b8843df2951b403