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

Change-Id: I6fef1ab4742d6b5bf7a46fde20d22564d06c97da