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

[automerger skipped] Revert^2 "Remove _light / _dark / from "fixed" sys resources" am: f819fa85 -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: Ic8dbb82c8a429661f657e5de337f46eec288d966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>