Merge "Camera: Support vendor tags from multiple providers" into oc-dev am: 97e6e199f9
am: b90551c1fa

Change-Id: I8f9e0b037e132b0a514ef15fadf9f3533a493c7d