Merge "DO NOT MERGE Remove window obscurement information. am: 5508ca2c19 am: 3847972ad2 am: cd71708eca am: 88855f8de7 am: 41f75ecb79  -s ours am: d0cd82abe9 am: f6cdbd7cc8" into oc-dr1-dev-plus-aosp
am: ddffbd84ca

Change-Id: I00da08b9dc91d378d6e87d8d218fda8d814601aa