Merge "CameraProvider: Refactor legacy name regex code" into oc-dev
am: 7b63265377

Change-Id: Ie8ec0292375064385b3786d79625cb3583e88531