[automerger skipped] Update room dependency to 2.0.0. am: 83a980b891  -s ours
am: 49ff67b05f  -s ours

Change-Id: I6e0f5f9c17de0e26612e6f015c0aefdc1b565cb5