Merge "FooterView color logic cleanup" into sc-qpr1-dev am: 3e7384fbe2

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

Change-Id: I7b92058ba3fee7ab415c95803493f81d85f98793