Merge "Merge "Fixes issue where notification jumps when user is dragging and...
Merge "Merge "Fixes issue where notification jumps when user is dragging and its updated" into oc-dr1-dev am: 58b0e698 am: 4254f6e4" into oc-mr1-dev-plus-aosp
am: dc2db1fb
Change-Id: Ic6f310a2e5507e7179e53c941bb6df576033f1ef