Merge "Merge "Fix flicker when transiting activities without animation." into oc-dr1-dev am: afe3eb81da am: 94e892a3e5" into oc-mr1-dev-plus-aosp
am: 6245029d11

Change-Id: I15f4aebd2b1020ea331e2b11adc9fee2cf31f2b4