Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am: 98429fbe am: 408728d4

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



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