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

[automerger skipped] Merge "Revert^2 "Remove _light / _dark / from "fixed" sys resources"" into udc-dev am: 55d96903 -s ours

am skip reason: Merged-In Ica78ebe4cfd97a8138e5c516922b498b3ed4b51f with SHA-1 7dcb774c is already in history

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



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