Merge "More app ops fg/bg tuning" into pi-dev
am: cd835ba418

Change-Id: Id6a026dabee96a175aac5b40b80487c8ed1ab511