Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into...
Merge "DO NOT MERGE Fix for syncs being dropped when appIdle is on" into mnc-dr-dev am: e210c998 am: 768e1df3
am: 7e65e5c6 -s ours
* commit '7e65e5c6':
DO NOT MERGE Fix for syncs being dropped when appIdle is on