Merge "Merge "Camera: Separate fast FPS range (>30) into different tests" into nougat-mr1-cts-dev am: 63d6da4321" am: 90aea86f61
am: 580850c8af

Change-Id: I79aa2ae9d98027e65e3174681b2745451e7fa171