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

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

Change-Id: I9d9213a42fb0f342f43d453d120d2c1c950a7bc2