Merge "Reduce app size by downgrading inactive apps" am: 8bcd66d35f
am: b11556fcf6  -s ours

Change-Id: I3daf016f968eeae3010fcde9d079b7f9ff2d7e48