Remove old configuration and use new config for MMTEL/RCS am: ba9727377a am: 3820a041a9

Change-Id: I7707bc1874750df56482af41027de20a4a724697