Merge "With content detection off, prefer default frame rate" into rvc-dev am: 98b789db am: 54835218

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/11538120

Change-Id: I17d2e36fcbd3e08eb757e1bd58b5d95f7d916983