Merge "Merge "Fixed an issue where a notification could stay userlocked" into...
Merge "Merge "Fixed an issue where a notification could stay userlocked" into oc-dr1-dev am: 7b04275a" into oc-dr1-dev-plus-aosp
am: 39f9b4db
Change-Id: Ib2ffe3304c3d8eb96c73d07cff41b4c47b995503