Fix DeviceAtomTestCase#getUid() am: 3faf777d58 am: bf2d6984bf

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/StatsD/+/18338229

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