Merge "Prevent permission race conditions in testSetSystemSelectionChannels" into stage-aosp-tm-ts-dev