Merge "Disable change password for call barring when FDN is enabled." am: 100fd75c3a

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2061907

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