Merge "[DO NOT MERGE] Fix flicker for Data Usage page" into tm-dev am: 98fa9deb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281653



Change-Id: I523a6650fc5b66b9d4b7d40765fd21e7fa8b19a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>