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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id63a8c95c48bd25b712d94f4f783aadacc07ef65