[automerger skipped] Merge "Support RCS master switch" am: 6de3c4c1 am:...

[automerger skipped] Merge "Support RCS master switch" am: 6de3c4c1 am: fea850f7 am: 0eccfd88 am: 3995a671 -s ours

am skip reason: Merged-In Ic4397cb167f38602883ba939b75e109edccfb028 with SHA-1 917f617a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918642

Change-Id: I7a2fa4e1d9b2de62bec7f47d1def2af29dc84c0b