Merge "Merge "Merge "Don\'t even try adjusting when dock is minimized" into...
Merge "Merge "Merge "Don\'t even try adjusting when dock is minimized" into nyc-dev am: 4b8ab89e" into nyc-mr1-dev am: cea2ff78" into nyc-mr1-dev-plus-aosp
am: d57dac93
* commit 'd57dac93':
Change-Id: I23041ce01acae23100674de6c39ace3b2abfc8d0