Merge "Track rename of READ_PHONE_NUMBERS" into oc-dev am: ec134fca1d
am: a5d31379d4

Change-Id: Ibe37fc9cb73e320219ef23a03e1c8ddf289fb8aa