Merge "Remove Modify popup menu for non-admin" into tm-qpr-dev am: 7a8a9e4f am: fcd8eefe

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



Change-Id: Ia487fc1634e0e1ceb3db2a6db5f8a59bf35dbcc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>