Merge "Fix background colors on some themes" into sc-dev am: 2b821d14

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5eb3f5b0c6231fcd9ec87fa66faaef7703eb25e