Merge "Merge "Use explicit user id for suspend settings" into android10-tests-dev am: deff91c200" into android11-tests-dev am: a9c7199bac

Original change: https://android-review.googlesource.com/c/platform/cts/+/1172104

Change-Id: I599e6907eb32461e0637f56797d4f9c33edc04e3