Merge "Add feature flag for RTT in call log" am: 138d07f82d
am: 9a5e663d97

Change-Id: Ibdf102659e079844e81faac327b0d9cfb3b0d9de