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

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

Change-Id: Ica055a7c8d3c1aaceeb7ddb0c47fed315bfff1fc