Merge "[Thread] flagging Android Thread APIs" into main