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

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

Change-Id: I1cb12d87f50af7f39b5bfb246a4d79e6f90bef61