Merge "Enforce sensors of the same type having a unique name." into sc-dev am:...

Merge "Enforce sensors of the same type having a unique name." into sc-dev am: 5ce2cca3 am: e0762765

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14967964

Change-Id: I21bc80a21aa1f7dcf72f4e51e6c074a2d9028732