Merge \"CameraIts: Use wait and notify for callback counter\" into marshmallow-cts-dev
am: 9fcf2d17e5

Change-Id: I002b093f6435f12a2b1fb976a72aac390b89b15c