[automerger skipped] Merge "Added support for Calls.FEATURES_VOLTE in call...

[automerger skipped] Merge "Added support for Calls.FEATURES_VOLTE in call log." am: 966020f8 am: 1cf5d1f1 am: 3cca4c4d -s ours
am skip reason: Change-Id Ia554be9e7150ea99c45ec011c166c1bcd87ddc9a with SHA-1 2a2829a4 is in history

Change-Id: If9f7ca1e8153d9b7878b65e776fd287076de4e80