Merge "Merge "Add framework flag to allow enable/disable resize." into rvc-dev am: c805ce31 am: de19dc51 am: 3204b8d2" into rvc-qpr-dev-plus-aosp