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

Change-Id: Ib1a0a1f322ea9b3cbca7ffc3eece6c3e5bd510d7