Merge "Move SingletonTest back to libutils_test" am: 9a57044ab3

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360220

Change-Id: Ic9c06cf69623150c041ce5e544a8eb6321f39623