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

Change-Id: I5ef46d8ecbbd6d163df263851250290fa01be5c9