[automerger skipped] Merge "Added a temp flag for feature canarying" am:...

[automerger skipped] Merge "Added a temp flag for feature canarying" am: db71841d am: 5b5ed6f1 am: dd31b7de -s ours am: 68157e9f -s ours

am skip reason: Merged-In I54c98355870d10d6d9aeac9f900ca92336ff49b8 with SHA-1 dd0f6ad7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1988654

Change-Id: I48b3dd4a80480477b5d4f0f88da548f92b487f1e