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 am: 61cc95f7

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



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