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

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

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