Merge "In E+E, the user can't enable the PSIM" into tm-dev am: bdd37ce348
am: b5e8c78adb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17092188 Change-Id: I3f6ad6b92a8f9c4a37f70527c0e278a27bcbfd4c
This commit is contained in: