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

Change-Id: I8b9c9dce82047a0ad4df48f5b93dcd24d4cfca92