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

Change-Id: I10a2f1013ee94d9ff7e6025259390f1357dce771