Merge "Properly remove local color areas of callback" into sc-v2-dev am: eb57e090bc

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

Change-Id: Ic1d9afedbb9b6dbfa85aa8671e7995b09bf3daf9