Merge "Camera2OneCameraManagerImpl: fix NPE when only one camera is available" am: 14c5d4f7b7 am: 5584e3b401

Change-Id: Iafb1fc26401e325f89eafed43131e2d3d2221e06