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

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

Change-Id: I14c4cb92e4a1e0d3606bd756ac9521b43624ecb9