Merge "Merge "With content detection off, prefer default frame rate" into rvc-dev am: 98b789db15 am: 69fe4dfd98 am: d7116ba744" into rvc-qpr-dev-plus-aosp am: 12a1de7925

Change-Id: I883aee3c06a47964ded763ac90c994a2c1ff2792