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: c20f0cab am: 551549cf am: 7f7bc9a6

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



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