Merge "TM#setNetworkSelectionModeAutomatic hang muliple minutes" am: 7407351620

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I444662ce605d31abafb218f57919e409fcf0eeff