Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr1.5-dev am: 33001945a8 am: 33b55366c5
am: 7191a77585  -s ours

* commit '7191a77585d04e5f8d472b37cc8b6f478eb708f5':
  DO NOT MERGE Fix for syncs being dropped when appIdle is on