Merge "Add test for BarringInfoChanged" am: 45048b9621 am: f2ee6f139e am: b86ce21307

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2255369

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