Merge "DO NOT MERGE Remove window obscurement information. am: c3c2ed94 am:...

Merge "DO NOT MERGE Remove window obscurement information. am: c3c2ed94 am: 96fe6421 am: 9d99b000  -s ours am: 3280efe5  -s ours am: b7373655 am: 3d1931d4  -s ours am: 6a7c6a24 am: e8b48abb am: a23674b4 am: b007784e  -s ours am: 712baa6c am: a5e996c2 am: 3674e3d9 am: a5ba83e2 am: 1ca8da19  -s ours am: 3455f8f5 am: 2ce8cd62" into oc-dr1-dev-plus-aosp
am: 3d042d2d

Change-Id: I3be24ffb349a35269eeb1126f85a14126d73a8ce