Merge "Merge "[Notif] Remove transient views on swipe out" into pi-dev am: 3622bfdba0" into pi-dev-plus-aosp