Merge "Merge "Add framework flag to allow enable/disable resize." into rvc-dev am: c805ce31 am: 20f45829" into rvc-d1-dev-plus-aosp