am 0abee344: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0abee344eb0c84ceb767d53afcca0b4d4ce4fc97':
  Camera2: Properly update FPS range when FPS is set.
  Drop video bitrate to 2.5mbps.
  Better power savings with wifi display code.
  Increase polling frequency again temporarily to fix A/V issues