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

Change-Id: Ib8a3d303bbf4642be30294d27aedf6b053facf92