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

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



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