Merge "Calls cancel on mDimAnimator to ensure that ref counts are accurate." into oc-dev
am: e6b55b9960

Change-Id: Id152c631fe22e169f3a84fce6006fc7adcdb2a53