pbcamera: Update API to avoid deadlock
am: 1e830e1db2

Change-Id: I636948f840acb768a46da2f3c20a23ff00e73629