Merge "Adds read/modify permission checks to ImsService" am: 3e64003641 am: 175213e1ee
am: 055adc457a

Change-Id: I41289905222c0bc83fe1d6b075427b79afe9b0db