Merge "Don\\'t toggle Data Saver again until it receives a callback. am: 484caa3035 am: a6ec072541" into nyc-mr1-dev-plus-aosp