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

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

Change-Id: I8b48c4f58524830c2ccb3cd56f217c6aa9a807a7