Merge "providerui: tag non_instant_app and not_multi_abi"