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

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

Change-Id: I1635670902ab37fc3722ad7cc28fc7a54fd86156