Fix testCameraManagerCameraCharacteristics am: 40364abafd am: 0b53fca95c am: 368e294393 am: 17c168cd0b
am: f5a47c8a25

Change-Id: I44949ff0f45ceec5ec53ee85415ad769f4b98f40