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: 6da5b20f

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

Change-Id: Ie6462127b23fb9418f535b5364b36d3ad3de2c4e