[automerger skipped] Merge "ARC++ swap for QuotaUtils" am: de6858efc7 am: 8ca9a21450
am: b281432c80  -s ours

Change-Id: I94bc0b4581ad4cbb7acf511cbd70fc1b88e80412