Merge "Ensure mShouldIgnoreVideoStateChanges is set on/off on fake...
Merge "Ensure mShouldIgnoreVideoStateChanges is set on/off on fake pause/resume. am: 6dee0e40 am: 1e722462" into oc-mr1-dev-plus-aosp
am: 3bcb88fe
Change-Id: I678155f6a24a8137e8f0c402c91c473207282010