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

Change-Id: Id2887350169f55b02c2a7aa67f63e20dbd8792da