Merge "TM#setNetworkSelectionModeAutomatic hang muliple minutes" am: 7407351620 am: 28b0a335d3 am: fa0c82f75c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f78b4165c79433177f13bd394f0a149f244e7d9