Merge "Merge "Boost android.anim and wm lock sections to -10 during transition" into oc-dev am: 713ad88afe am: e7a5369ab4" into oc-dr1-dev-plus-aosp
am: 5ccfb31de9

Change-Id: Iaedcc2493469f8a09ed038e43d94715260c282ca