Merge "Restore non-scrolling UI on long screenshots crash" into sc-dev am: 7ab8dd98ba am: 86121fa466 am: dc1c79ed7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161573 Change-Id: If2acbd392f82909f3a1bcbba1db6e4c6dd444609
This commit is contained in: