Merge "Merge "Fixed an issue where the notification could stay userlocked" into oc-dev am: dc66506f0a am: 81c8d5f861" into oc-dr1-dev-plus-aosp
am: e97fb9f8a3
Change-Id: Ic41ffd6bbb736b9a196e5260d9bdaf391b7f7720
This commit is contained in: