Merge "Store jankListener and surfaceStatListeners by layerId" into sc-v2-dev am: 85f88c4999

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

Change-Id: Ie86033921a99c031d9c4517ac1bde024588448ed