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

Change-Id: Ib156c92bde8571cad70b1fe2cef0f03d9eae54b4