Merge changes from topic "cherrypick-refactor_compact_status-3o1lsmqltp" into tm-mainline-prod am: 937e8a5cf2

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

Change-Id: If4709521a70fa011153dda408b18c38120f70fc5