Merge "Merge "Ensure surfaces only resize during relayout." into nyc-dev am: 58f1167ecf am: 197f9e1c7e" into nyc-mr1-dev-plus-aosp
am: aeb1d151c5
* commit 'aeb1d151c58e06a5ce6391b9884242e5947c28fe':
Change-Id: I04abcc7f87048ae2d1e0575ba37482e3b8cfcef2
This commit is contained in: