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: I62c921e354c163bee8416236ae0b0a2b73364945