Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev
am: 713ad88afe

Change-Id: Ie76d079092805920ebd6820ce412691ccdceb039