Merge "Fix color sampling for landscape" into sc-dev am: 16d968616f am: 27cb03494e

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

Change-Id: I1205c628d592bb69839030ec4387f793d581b884