Merge "Changed botversion feature tags for chatbot_v2 and chatbot_sa_v2" am: 761840d5ff am: e502c26627

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1947707

Change-Id: I844d7094506c3ffbb95e7f2a24d87fdccd052d7b