Merge changes from topic "merge-unique-id-tests" into sc-v2-dev am: 92ffdd5b

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

Change-Id: I78a375d7a3b959d90e5bbec400590e696a09609c