Merge "Merge "Unset the notification expansion state when fully hidden" into qt-r1-dev am: 24907e82a9 am: 9af9fe39f0" into qt-qpr1-dev-plus-aosp