Merge "Camera: fix race in onRepeatingRequestError callback" into oc-mr1-dev
am: f23334869d

Change-Id: I0c3c9544e37219110178c864ff2ec6b28b467f63