Merge "CP GuestUserInteractorTest.kt that got left out of CP somehow." into aosp-main-future