Merge "Revert^2 "Remove _light / _dark / from "fixed" sys resources"" into udc-dev am: 55d96903

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



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