Merge "Fixing many inverted values for light/dark theme" into udc-dev am: 4556d4b2 am: 7c244937

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



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