Merge "Merge "Notification: Fix bug with sliding action list" into nyc-dev am: 06fe24341c am: 389c4e67e9" into nyc-mr1-dev-plus-aosp
am: e6446f90d1
* commit 'e6446f90d121d47e734099adeebc86bb9b72ae9c':
Change-Id: I56a7add944457381b636a3ab23ea3ccdd6ee7621
This commit is contained in: