Merge "camera2 ndk: Fix vndk error return value for ACameraManager::OpenCamera()." am: 5995f21460

Change-Id: I9994a5612b759400f7a6681df434ff44a048e74a