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

Change-Id: I4e75a7ccdedc15cb428edbf65624ad3181313b7c