Merge "Merge "Minor optimization to skip bitmap copy during luma sampling" into rvc-dev am: d972004c am: 397ec51f am: 9cfb46c0" into rvc-qpr-dev-plus-aosp