Merge "Cleanup Quota limit in Installd" am: eddf8dd360
am: 350684f680

Change-Id: I4d6f886820546f6298a492dbc6af430cf76cf9ab