Merge "Keep the screen on while the test activity is on top." into tm-dev am: 40840355fa

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

Change-Id: I63499791b9972859052691b4165bbc109ee4234e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>