Merge "Update usage of deprecated coroutines methods" into stage-aosp-master