Merge "Do not expand quick settings when shade first opens" into sc-dev am:...

Merge "Do not expand quick settings when shade first opens" into sc-dev am: 8b6cc5fd am: 6ec151ef

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

Change-Id: I6cb46cbfb3a9a4a577360aa209960273d6b9d005