Merge "Fix homepage cards show up problem after first launch" into rvc-dev am:...

Merge "Fix homepage cards show up problem after first launch" into rvc-dev am: 64dbdebf am: 7ebe5111 am: 2e67b3f6

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

Change-Id: Ic3ba82a08f20fa035075c3b3af0ae043be55504e