[automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4
am: 5bf89f4f5a
-s ours
am skip reason: Change-Id I18c2fa70a47fa7fb082a974dbd5acd61cf9f9c38 with SHA-1 4ecff2c833
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1393243
Change-Id: I9255cfd3c8941b049c752b1dc4d4a1dfa1c84879
This commit is contained in: