[automerger skipped] Merge "Add new column for IMS_RCS_UCE_ENABLED per subscripiton" am: bdb5db0c42 am: 26ead1eb7f am: 85849b4dac -s ours
am skip reason: Change-Id I4a86e279fb70ffc4cfa9fdaefe1db326ea4445e6 with SHA-1 748c762e78 is in history

Change-Id: Ibe9cbd38d8ea25ee3819985eb48640ea695f58d4