Merge "Use alpha instead of invisible for views below shelf to skip redraw" into sc-dev am: 27a1fdb018

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

Change-Id: Ie9ece86634d0131b2515ec1b78f12c9260ae472e