Merge "Fix "show system apps" status lost when switching on/off dark theme"...

Merge "Fix "show system apps" status lost when switching on/off dark theme" am: df8e9c63 am: c0904055

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



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