Merge "DO NOT MERGE Remove window obscurement information. am: c3c2ed94ff am: 96fe6421f6 am: 9d99b0001e  -s ours am: 3280efe50e  -s ours am: b737365553 am: 3d1931d4e3  -s ours am: 6a7c6a24a7 am: e8b48abb02 am: a23674b4f9 am: b007784ed1  -s ours am: 712baa6c99 am: a5e996c2e2 am: 3674e3d9d8 am: a5ba83e2ee am: 1ca8da1969  -s ours am: 3455f8f527 am: 2ce8cd62c3" into oc-dr1-dev-plus-aosp am: 3d042d2d39
am: f0a47b9414  -s ours

Change-Id: Id4ab4c008107950cef02995c06d8f36da3d3b813