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

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

am skip reason: Merged-In I423e5bd35b9caa076b0376b4ff04fda1e2d36deb with SHA-1 0c3474a2 is already in history

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



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