Merge "Fix HDR layer info listener to use the right area" into sc-dev am: e565bb8181 am: 1b1005ef52

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

Change-Id: I787ec7c25c3b99510c0f71174ebdf0f4f2f8d82c