[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources"...

[resolved conflict] Merge "Remove _light / _dark / from "fixed" sys resources" into udc-dev am: c6c42579 am: cde8b906

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



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