[automerger skipped] Merge "Added support for writing Calls.FEATURES_WIFI and Calls.FEATURES_HD_CALL to the Call Log." am: 8ec18eb98c am: 56e9e90762 am: 2fc1bb539d
am: 81c42b461a -s ours
am skip reason: change_id I12e5785c669c615e3e53016dde06caea5c0ea38e with SHA1 9c1af6a9f1 is in history

Change-Id: I7c3a0f166927804944c7dfc31da2388a2ac7345a