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

Change-Id: I23ca5917cb8fbd496d29c1bb9f425e11fdae2cdd