DO NOT MERGE

Guard the camera workaround with a targetsdk check

BUG: 149569689
Test: portrait shots by camera show up in gallery
Change-Id: I63d1412a9e0c3dfdcad2199dfd871f4b8956234e
Merged-In: I63d1412a9e0c3dfdcad2199dfd871f4b8956234e
(cherry picked from commit 4ef9e0ca633bb2bbed84d9233eef6f0efef574c2)
1 file changed