Merge "Fix ImsMmTelManager docs to use annotations" am: 63df8520ff
am: 773209c5d2

Change-Id: Ic1c1b5e37fd7682855ef49d3abc465818d588e2d