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

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

Change-Id: I52fdd0935276df3cbc76263b1015e2c779f53b47