Merge "Merge "Don't halt movement notifications when display is frozen." into...
Merge "Merge "Don't halt movement notifications when display is frozen." into nyc-mr1-dev am: 6f91c193 am: b4c6575a" into nyc-mr1-dev-plus-aosp
am: b9bae8ce
Change-Id: I5e1479ba32d009acd1649248f719db5c09290fcf