[automerger skipped] Merge "[Settings] Remove Phone hidden constants access" am: c78b12f3f4
am: 5bf89f4f5a
-s ours am: 85ace93774
-s ours am: 911a4f6734
-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: I6f99ea37ea2ace954bafc6c2066560c4680c4843
This commit is contained in: