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

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

am skip reason: Merged-In I834cb61b87fe98e65534fbd30baa17fa348ac6a9 with SHA-1 00c774e8 is already in history

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



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