Merge "Do not relayout when expanding shade" into sc-v2-dev am: c8209cac am: 85fb35ed

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

Change-Id: Ic88a8ce44dae5e5beeb75f6aab852a8c9b08c3ba