[automerger skipped] Merge "Added support for Calls.FEATURES_VOLTE in call...
[automerger skipped] Merge "Added support for Calls.FEATURES_VOLTE in call log." am: ecdc2ce0 am: bf420a18 am: 463669a3 -s ours
am skip reason: Change-Id I78eb1075d2caf2af1c2ce88b75eb1f8caa43fb81 with SHA-1 1ebc288c is in history
Change-Id: I5c696debb6d3f6db9c6f5253aa300d9d4e8b917d