Merge "Moved ERI configuration files from resoures to Carrier Config." into nyc-dev
am: add479f

* commit 'add479fdcdc542c520e7cda06e8daa3bc424724c':
  Moved ERI configuration files from resoures to Carrier Config.

Change-Id: Iee83ea123d5fc99d4a6d47d39dd4e09847c2b755