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

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



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