Merge "Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev...

Merge "Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev am: 7ab8dd98 am: f75d3ab3" into sc-v2-dev-plus-aosp am: fece1b31

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

Change-Id: I7fc7c649bbf14ebfeb53301c35b23c6799487e53