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

Change-Id: Idd18d8e092b1628eb0a08d579d6a6a488ce01026