Merge "[automerger skipped] Merge "Go home before starting AwareActivity." into oreo-cts-dev am: 39fe8f1a21 -s ours" into oreo-mr1-cts-dev am: 6043a08a02 -s ours am: 56726ef856 -s ours am: de9f229a2a -s ours am: d5fe2bdfa8 -s ours am: 9efd8fa810 -s ours am: 3ef47d170c -s ours

am skip reason: Change-Id Id3f5ac103a4f9bb404954cb305ee5be28e00bf26 with SHA-1 e0e48fae60 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/834320

Change-Id: I72924c8601c8adbc09d4fc511a9a8b5c9bf5e7af