[automerger skipped] Merge "Revert "Remove _light / _dark / from "fixed" sys...

[automerger skipped] Merge "Revert "Remove _light / _dark / from "fixed" sys resources"" into udc-dev am: 5c3928ac -s ours am: d186b2d6 -s ours

am skip reason: Merged-In I423e5bd35b9caa076b0376b4ff04fda1e2d36deb with SHA-1 0c3474a2 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22200305



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