Merge "cts: Re-launch the desired activity after screen-on on TVs." am: 422c7dd460 am: 821cd25be2

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1900117

Change-Id: Ib7a74c2d879d2989aa27c3703f65c0e344320711