Merge "Add back support for force resize developer option." into oc-mr1-dev
am: 23b7a8ad8b

Change-Id: Ie167ce8ad4b6efddaa16eb0abca41ee3520229c6