Merge "Add API 26 support to play store utilities and watchers." into emu-master-dev