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

Change-Id: I44de419a5b170d6fd5b1d26f4291eb3750b11c59