Merge "Fix a shared identity test" into udc-dev am: 1ce7457c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21618087



Change-Id: I1f1731c23f674f6c885bee23b021661729c896e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>