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

Change-Id: Ic44cc4f8d0fd8381dfe89a27cc3ad6c9fad42d0e