Merge "Merge "Added tests for idle apps and doze mode." into nyc-dev am: f76c309ebe am: 999a4fef2d" into nyc-mr1-dev-plus-aosp