chore(android)!: forward-port to new architecture method

chore(android)!: forward-port to new architecture method #640