[automerger skipped] Merge "Camera: Advertise numbered string ID for external...
[automerger skipped] Merge "Camera: Advertise numbered string ID for external cameras" into rvc-dev am: 7bf05d75 am: a2b9e0a1 -s ours
am skip reason: Change-Id I6309d16be565616f048fb24a70e9be5b2f5ed480 with SHA-1 34cdbcde is in history
Change-Id: I3be5cdce1f0f0e5a8d8fc4c947d73655b4ae7ee8