Merge "Fix flicker for AppDataUsage when zero usage" into tm-dev am:...

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

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



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