Merge "Merge "Keep notifications with active remote inputs" into nyc-dev am: 0444314f8b am: 03174b8cca" into nyc-mr1-dev-plus-aosp
am: c95cc27856
* commit 'c95cc2785627574e45018e62e5aea168b18b5cda':
Change-Id: I63aa783cbe77ceb7e5c5163022b5f335580d297e
This commit is contained in: