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

Change-Id: Ia2f286a67f98272d787ccb7ed49e88ae91720b2a