[automerger skipped] Merge "DO NOT MERGE base: getDataUsageInfo get cycle validation" am: e899768988  -s ours
am: a29cfcb891  -s ours

Change-Id: I202aed4ba32f3f1510f09323e0b72150aba6a58e