[automerger skipped] Merge "Running various lifecycle-related tests on main thread" am: 842af183 am: 8d0b3ee4 -s ours

am skip reason: Merged-In Ib77248bc6d44cc9c8a5d2ad0e5c95feab6a54a01 with SHA-1 5676d988 is already in history

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

Change-Id: I853bfce44380b01e530e8e84a7a9dbd6c0d014b2