Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev
am: 890c430416

Change-Id: Id19480f5051b3e96b2fea0e768af5fbaf3d746a8