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

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

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