Merge cherrypicks of [19129308, 19129309] into tm-release.

Change-Id: I92882b42e785523d053b058da8e4c052a32664ce
diff --git a/device-oriole.mk b/device-oriole.mk
index a2d6522..1346e8c 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -98,6 +98,9 @@
 PRODUCT_COPY_FILES += \
 	device/google/raviole/media_profiles_oriole.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
+PRODUCT_PROPERTY_OVERRIDES += \
+    persist.vendor.camera.fixed_fps_range_boost=1
+
 # Display Config
 PRODUCT_COPY_FILES += \
 	device/google/raviole/oriole/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 314f634..a6934b2 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -5,6 +5,7 @@
       "Path": "/sys/devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/min_freq",
       "Values": [
         "3172000",
+        "1352000",
         "1014000",
         "421000"
       ],
@@ -1134,6 +1135,24 @@
       "Value": "0"
     },
     {
+      "PowerHint": "CAMERA_FIXED_FPS",
+      "Node": "MemFreq",
+      "Duration": 4000,
+      "Value": "1352000"
+    },
+    {
+      "PowerHint": "CAMERA_FIXED_FPS",
+      "Node": "CPUBigClusterMaxFreq",
+      "Duration": 4000,
+      "Value": "9999999"
+    },
+    {
+      "PowerHint": "CAMERA_FIXED_FPS",
+      "Node": "CPUBigClusterMinFreq",
+      "Duration": 4000,
+      "Value": "1106000"
+    },
+    {
       "PowerHint": "FIXED_PERFORMANCE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 0,