Merge "Re-enabling the test after the fix for testClass0Sms Fix provided in...

Merge "Re-enabling the test after the fix for testClass0Sms Fix provided in ag/21806845 which checks the BroadcastOptions Bug: 269760622 Test: atest FrameworksTelephonyTests" into udc-dev am: 6145f20b

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



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