Merge "Update DisplayContent tap exclude region on window resize" into oc-mr1-dev
am: 43bc0adc9d

Change-Id: Ifc88f5ea9a359fce64dd63b471488dd5cc4c9912