[automerger skipped] Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation" am: e899768988 -s ours am: a29cfcb891 -s ours
am: e02cb46947 -s ours
Change-Id: I94cda216537c4073eb19a60da6a0f129aa344329
This commit is contained in: