Merge "[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102 skipped: c2116af15c am: dfe44a12ab am: 34ec404b4b" into oc-dr1-dev-plus-aosp am: 47d2f1aa90
am: e5e1d4f4b0  -s ours

Change-Id: Ife99c742af6dbf859c48e0b15af87b5b7cc5001b