[automerger skipped] Merge "Changed botversion feature tags for chatbot_v2 and chatbot_sa_v2" am: 761840d5ff am: e502c26627 am: d3bc724b8b am: 266226c87f -s ours

am skip reason: Merged-In I24d9ac8af31e78d6228259dcf6451e4fbbfbdda7 with SHA-1 38970ab4a4 is already in history

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

Change-Id: Iae1e915de3dee86e5edc5393bfabeafbc2048102