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

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

Change-Id: If2f6da1ba28762f91f6045f73f38fbfc475fb4b4