Merge "Keep HUN opaque for transition to shade" into sc-dev am: 38cb397b am: cf834cf1 am: c48d1e0d

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

Change-Id: I2057ec23f4fbf710f581176c7ba8e1beaa0a418f