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

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

Change-Id: I862a8a10a5f5b58336d3241dd4180d0a2c95f2be