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