Merge "Prevent tests with reboot from running during presubmit" am: 6916f91f55 am: 131d03d6bf am: 057bac2724

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I363e8968ca7fc436228458a5239b909d8d156105