Merge changes from topic "am-024002b63b1b4a3eaa275de8a80040cc"

* changes:
  [automerger skipped] Merge "DO NOT MERGE Force slowJpegMode on certain camera1 apps" into tm-qpr-dev am: ff19de5f am: 9f6abee5 -s ours am: 78ef8613 -s ours am: ddaf4b0d -s ours
  [automerger skipped] DO NOT MERGE Force slowJpegMode on certain camera1 apps am: fa9aa00a am: 8a17fac0 -s ours am: d706dd2c -s ours am: fc290562 -s ours