Merge "Speculative fix for exception in CoordinatorLayout.onLayout" into nyc-support-24.1-dev
am: 37bb8307f3

Change-Id: If9aab2d6034b80a6d6ce9499156ff564e2b706ee