Merge "Add testForget to STS" into rvc-dev am: 3c28a9d2a0 am: ab63189c96

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

Change-Id: I6e237cdd53b0614ad6fba2d83c873c0172a9dd37