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

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

Change-Id: If6a39ceaad9117f765ede953b75118e0e002d432