[automerger skipped] In E+E, the user can't enable the PSIM am: ccd55cc5c9
am: 6282d8a5de
am: 10d36c9800
-s ours am: d1ae5c3d08
-s ours am: 11213d623e
-s ours
am skip reason: Merged-In Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec with SHA-1 68cfaafe73
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408
Change-Id: I0116edde251547b63666f1443c4f5b097736e9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: