DO NOT MERGE Fix EAS backoff behavior

Cherrypick of https://googleplex-android-review.googlesource.com/#/c/211205/2

Bug: 6881519
Change-Id: I53a8c57124406df85281ca41ba6fc8facdcd1ded
merge in jb-mr0-release history after reset to jb-dev
DO NOT MERGE Fix calendar availability

Bug: 6933598
Change-Id: Id481982de9bdc07dbc06722b69e788372ebf1c57
merge in jb-mr0-release history after reset to jb-dev
Merge android-4.1.2_r1