[automerger skipped] Merge "[Settings] Remove Phone hidden constants access"...

[automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3 am: 5bf89f4f -s ours am: 85ace937 -s ours

am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c8 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393243

Change-Id: I2152fd099e308d8e13cbe861f86db5afdcb288ce