Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f am: 131d03d6

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580533

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e0bd75b8a65fc39288a6f92e8d5473060ccbd95