Merge "Fix HDR layer info listener to use the right area" into sc-dev am: e565bb81 am: 3a84371b am: 8333c35b

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

Change-Id: I3b1d372c44c9320a37522eafff5840725782bff6