Merge "[Ravenwood] Always provide main thread" into main am: f814fea81e am: 8677690d50

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

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