Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c99809 am: 768e1df375
am: 7e65e5c681  -s ours

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