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

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

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