Feature/update provider list for bitmask android #6517