Merge "Merge "Report layer boost at all levels, not just Activity" into...

Merge "Merge "Report layer boost at all levels, not just Activity" into rvc-dev am: a91a1517 am: 5be8caf1" into rvc-d1-dev-plus-aosp am: 96b4538d

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

Change-Id: Ifcfda4ab0288b43228f4cd2d3bfc6f98992c6d0f