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

Change-Id: Ib799bb3d0551dc86371a75a02561b8bdd4db0daf