Merge "Merge "Workaround for ignored resizeableActivity param" into nyc-dev am: 005f9a73fb am: ede05733f0" into nyc-mr1-dev-plus-aosp
am: 073466ea8a

* commit '073466ea8a25a94327f7d9e7a2cf9dd858d8d626':

Change-Id: Ib9bf553be08ac9c31d521f57c9b31543f3d76f3e