Merge "Return colors of areas even if they are not in current page" into...

Merge "Return colors of areas even if they are not in current page" into sc-dev am: 1e70989c am: 3dc3abe2

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

Change-Id: Ic9a15ad77ccb7003b9605457d61d0665eae6f812